Merge from emacs-24; up to r111314

diff --cc doc/lispintro/ChangeLog
Simple merge

diff --cc doc/lispintro/emacs-lisp-intro.texi
Simple merge

diff --cc doc/lispref/ChangeLog
index 85bb5a29e013ee328dbd0918fdfdf37d5e2f0123,c086e8543b99ae9e855642f7c3caed15a611ef00..6fc557108e87335190f91159437a49e28de77862
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,4 -1,8 +1,8 @@@
 -2013-02-27  Bastien Guerry  <bzg@gnu.org>
+ 2013-03-03  Glenn Morris  <rgm@gnu.org>
+ 
+       * objects.texi (Symbol Type): Fix typo.
+ 
 +2013-02-28  Bastien Guerry  <bzg@gnu.org>
  
        * variables.texi (File Local Variables): Fix reference.